From: Carlos Garnacho <carlosg@gnome.org>
Date: Fri, 29 Oct 2021 14:43:15 +0000 (+0200)
Subject: inputMethod: Do not communicate preedit text change on reset
X-Git-Tag: archive/raspbian/50.5-1+rpi1~1^2~536^2^2~101
X-Git-Url: https://dgit.raspbian.org/%22http://www.example.com/cgi/%22/%22http:/www.example.com/cgi/%22?a=commitdiff_plain;h=047691b0d3471630ec80e32f371291dd2ef02419;p=gnome-shell.git

inputMethod: Do not communicate preedit text change on reset

This is now done in the ClutterInputFocus for us, since
https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/1940. There
is no need to duplicate this call, and it happens to cause undesired
scrolling to content in some cases when this reset happens during
a change in the IM focused client state.

Fixes: https://gitlab.gnome.org/GNOME/gnome-shell/-/issues/4647
Part-of: <https://gitlab.gnome.org/GNOME/gnome-shell/-/merge_requests/2011>
---

diff --git a/js/misc/inputMethod.js b/js/misc/inputMethod.js
index 7de7540d3..71dff84f5 100644
--- a/js/misc/inputMethod.js
+++ b/js/misc/inputMethod.js
@@ -186,11 +186,7 @@ class InputMethod extends Clutter.InputMethod {
             this._emitRequestSurrounding();
         }
 
-        if (this._preeditStr !== null) {
-            // Unset any preedit text
-            this.set_preedit_text(null, 0, Clutter.PreeditResetMode.CLEAR);
-            this._preeditStr = null;
-        }
+        this._preeditStr = null;
     }
 
     vfunc_set_cursor_location(rect) {